CLI: normalize lora.ignore_incoming IDs (dec/!hex/0x), dedupe, YAML [] clear, fix bytes→int crash #834
Conversation
Signed-off-by: Niklas Roslund <[email protected]>
|
Is it possible to get a review on this PR or get it merged? Would be deeply appreciated! @ianmcorvidae |
|
Hi, I've been short on time lately but giving it a look now. It's worth noting that |
meshtastic/node.py
Outdated
| def _to_node_num(self, nodeId: Union[int, str]) -> int: | ||
| """Normalize node id from int | '!hex' | '0xhex' | 'decimal' to int.""" | ||
| if isinstance(nodeId, int): | ||
| return nodeId | ||
| s = str(nodeId).strip() | ||
| if s.startswith("!"): | ||
| s = s[1:] | ||
| if s.lower().startswith("0x"): | ||
| return int(s, 16) | ||
| try: | ||
| return int(s, 10) | ||
| except ValueError: | ||
| return int(s, 16) | ||
|
|
There was a problem hiding this comment.
I like this structure, but I think this function belongs in meshtastic.util, perhaps something like to_node_num there. (side note that most of the functions there are camelcase rather than underscores, but I think we may as well follow pep8 when we can).
Doesn't need to block merging, but if you're able to move this there that'd be appreciated!
There was a problem hiding this comment.
This has now been moved to util! Seems to be a bit of mixture between camelcase and underscores but i kept to_node_num.
|
heh, I think that failure is due to another PR. I'm gonna merge it and fix locally if needed |
2 participants
Fixes #833
Summary
!hex, and0xhex; normalize to int.lora.ignore_incomingon write.config.lora.ignore_incoming: []reliably.'bytes' object cannot be interpreted as an integer.Why
CLI operations around ignore list were brittle:
Behavior
--set lora.ignore_incoming <id>accepts dec/!hex/0xhex and stores one normalized entry.--get lora.ignore_incomingreflects deduped list.config.lora.ignore_incoming: []clears list.Notes
Firmware still shows packets in logs; enforcement is firmware-level and out of scope here.
No breaking changes—CLI becomes more permissive and robust.